From: Mattias Engdegård <mattiase@acm.org>
Date: Tue, 9 Jul 2019 11:38:10 +0000 (+0200)
Subject: Repair macOS build
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~2426
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fdea0e602b4ec013736aff5615db0777ed89b187;p=emacs.git

Repair macOS build

Avoid macro redefinition of `open' in lib/fcntl.h to break use of it as
a struct member in src/font.c.

* src/font.c: #undef open
---

diff --git a/src/font.c b/src/font.c
index b4a85a1ca5a..457f3f99583 100644
--- a/src/font.c
+++ b/src/font.c
@@ -44,6 +44,10 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include TERM_HEADER
 #endif /* HAVE_WINDOW_SYSTEM */
 
+/* Avoid macro definition of `open' in generated lib/fcntl.h to mess up
+   use of it as a struct member.  */
+#undef open
+
 #define DEFAULT_ENCODING Qiso8859_1
 
 /* Vector of Vfont_weight_table, Vfont_slant_table, and Vfont_width_table. */